From 2fc15d31cf2fd3f416e2309adca113861205167f Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sun, 14 May 2006 03:30:39 +0000 Subject: [PATCH] Move an assert to the right place. (#341661, Pascal Terjan) 2006-05-13 Matthias Clasen * gtk/gtktextview.c (gtk_text_view_allocate_children): Move an assert to the right place. (#341661, Pascal Terjan) --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ gtk/gtktextview.c | 4 ++-- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2180aab0b1..f70c95b87c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-05-13 Matthias Clasen + + * gtk/gtktextview.c (gtk_text_view_allocate_children): Move + an assert to the right place. (#341661, Pascal Terjan) + 2006-05-12 Matthias Clasen * gtk/gtknotebook.c: Fix some corner cases in the size diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 2180aab0b1..f70c95b87c 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2006-05-13 Matthias Clasen + + * gtk/gtktextview.c (gtk_text_view_allocate_children): Move + an assert to the right place. (#341661, Pascal Terjan) + 2006-05-12 Matthias Clasen * gtk/gtknotebook.c: Fix some corner cases in the size diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c index ad5825994a..49b5dc2478 100644 --- a/gtk/gtktextview.c +++ b/gtk/gtktextview.c @@ -2901,6 +2901,8 @@ gtk_text_view_allocate_children (GtkTextView *text_view) { GtkTextViewChild *child = tmp_list->data; + g_assert (child != NULL); + if (child->anchor) { /* We need to force-validate the regions containing @@ -2933,8 +2935,6 @@ gtk_text_view_allocate_children (GtkTextView *text_view) GtkAllocation allocation; GtkRequisition child_req; - g_assert (child != NULL); - allocation.x = child->x; allocation.y = child->y; -- 2.30.2